[NET] gso: Fix reversed error test in netif_tx_trylock
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 25 Jul 2006 14:21:59 +0000 (15:21 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 25 Jul 2006 14:21:59 +0000 (15:21 +0100)
Original changelog:

    [NET]: Fix reversed error test in netif_tx_trylock

    A non-zero return value indicates success from spin_trylock,
    not error.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
patches/linux-2.6.16.13/net-gso-3-fix-errorcheck.patch [new file with mode: 0644]

diff --git a/patches/linux-2.6.16.13/net-gso-3-fix-errorcheck.patch b/patches/linux-2.6.16.13/net-gso-3-fix-errorcheck.patch
new file mode 100644 (file)
index 0000000..0b3dfd2
--- /dev/null
@@ -0,0 +1,17 @@
+diff -urp a/include/linux/netdevice.h b/include/linux/netdevice.h
+--- a/include/linux/netdevice.h        2006-07-25 15:16:39.314333975 +0100
++++ b/include/linux/netdevice.h        2006-07-25 15:19:37.298320799 +0100
+@@ -930,10 +930,10 @@ static inline void netif_tx_lock_bh(stru
+ static inline int netif_tx_trylock(struct net_device *dev)
+ {
+-      int err = spin_trylock(&dev->_xmit_lock);
+-      if (!err)
++      int ok = spin_trylock(&dev->_xmit_lock);
++      if (likely(ok))
+               dev->xmit_lock_owner = smp_processor_id();
+-      return err;
++      return ok;
+ }
+ static inline void netif_tx_unlock(struct net_device *dev)